Add a "metric" property.

2005-04-03  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkruler.c: Add a "metric" property.

diff --git a/ChangeLog b/ChangeLog
index 0fbf5ef596449133df9a35922953eaf22267350b..32a951b98b53baddbb3619a2693728afb2970231 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-04-03  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkruler.c: Add a "metric" property.
+
        * gtk/gtkradiomenuitem.c: Add a "group" property like
        the one found in radio buttons.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0fbf5ef596449133df9a35922953eaf22267350b..32a951b98b53baddbb3619a2693728afb2970231 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,7 @@
 2005-04-03  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkruler.c: Add a "metric" property.
+
        * gtk/gtkradiomenuitem.c: Add a "group" property like
        the one found in radio buttons.
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0fbf5ef596449133df9a35922953eaf22267350b..32a951b98b53baddbb3619a2693728afb2970231 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,7 @@
 2005-04-03  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkruler.c: Add a "metric" property.
+
        * gtk/gtkradiomenuitem.c: Add a "group" property like
        the one found in radio buttons.
 

diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c
index 77f31e24ba4227e11735da65fc68aa4820ed5191..f4e00ed2440f847c911f774b51c3ea69a13ecb02 100644 (file)
--- a/gtk/gtkruler.c
+++ b/gtk/gtkruler.c
@@ -35,7 +35,8 @@ enum {
   PROP_LOWER,
   PROP_UPPER,
   PROP_POSITION,
-  PROP_MAX_SIZE
+  PROP_MAX_SIZE,
+  PROP_METRIC
 };
 
 static void gtk_ruler_class_init    (GtkRulerClass  *klass);
@@ -154,6 +155,14 @@ gtk_ruler_class_init (GtkRulerClass *class)
                                                        G_MAXDOUBLE,
                                                        0.0,
                                                        GTK_PARAM_READWRITE));  
+  g_object_class_install_property (gobject_class,
+                                   PROP_METRIC,
+                                   g_param_spec_enum ("metric",
+                                                     P_("Metric"),
+                                                     P_("The metric used for the ruler"),
+                                                     GTK_TYPE_METRIC_TYPE, 
+                                                     GTK_PIXELS,
+                                                     GTK_PARAM_READWRITE));  
 }
 
 static void
@@ -197,6 +206,12 @@ gtk_ruler_set_property (GObject      *object,
       gtk_ruler_set_range (ruler, ruler->lower, ruler->upper,
                           ruler->position,  g_value_get_double (value));
       break;
+    case PROP_METRIC:
+      gtk_ruler_set_metric (ruler, g_value_get_enum (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
     }
 }
 
@@ -222,6 +237,9 @@ gtk_ruler_get_property (GObject      *object,
     case PROP_MAX_SIZE:
       g_value_set_double (value, ruler->max_size);
       break;
+    case PROP_METRIC:
+      g_value_set_enum (value, gtk_ruler_get_metric (ruler));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -238,6 +256,8 @@ gtk_ruler_set_metric (GtkRuler      *ruler,
 
   if (GTK_WIDGET_DRAWABLE (ruler))
     gtk_widget_queue_draw (GTK_WIDGET (ruler));
+
+  g_object_notify (G_OBJECT (ruler), "metric");
 }
 
 /**